Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 5 Jun 2010 11:10:33 +0000 (11:10 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 5 Jun 2010 11:10:33 +0000 (11:10 +0000)

Trivial merge